git.openwrt.org Git - openwrt/openwrt.git/blob

   1 From e3d6bfdfc0aeb8c1d7965413b1050ec07f9761e5 Mon Sep 17 00:00:00 2001
   2 From: Lorenzo Bianconi <lorenzo@kernel.org>
   3 Date: Thu, 1 Aug 2024 16:35:07 +0200
   4 Subject: [PATCH 5/8] net: airoha: Use qdma pointer as private structure in
   5  airoha_irq_handler routine
   6
   7 This is a preliminary patch to support multi-QDMA controllers.
   8
   9 Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
  10 Link: https://patch.msgid.link/1e40c3cb973881c0eb3c3c247c78550da62054ab.1722522582.git.lorenzo@kernel.org
  11 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  12 ---
  13  drivers/net/ethernet/mediatek/airoha_eth.c | 7 +++----
  14  1 file changed, 3 insertions(+), 4 deletions(-)
  15
  16 --- a/drivers/net/ethernet/mediatek/airoha_eth.c
  17 +++ b/drivers/net/ethernet/mediatek/airoha_eth.c
  18 @@ -1974,8 +1974,7 @@ static int airoha_qdma_hw_init(struct ai
  19
  20  static irqreturn_t airoha_irq_handler(int irq, void *dev_instance)
  21  {
  22 -       struct airoha_eth *eth = dev_instance;
  23 -       struct airoha_qdma *qdma = &eth->qdma[0];
  24 +       struct airoha_qdma *qdma = dev_instance;
  25         u32 intr[ARRAY_SIZE(qdma->irqmask)];
  26         int i;
  27
  28 @@ -1985,7 +1984,7 @@ static irqreturn_t airoha_irq_handler(in
  29                 airoha_qdma_wr(qdma, REG_INT_STATUS(i), intr[i]);
  30         }
  31
  32 -       if (!test_bit(DEV_STATE_INITIALIZED, &eth->state))
  33 +       if (!test_bit(DEV_STATE_INITIALIZED, &qdma->eth->state))
  34                 return IRQ_NONE;
  35
  36         if (intr[1] & RX_DONE_INT_MASK) {
  37 @@ -2038,7 +2037,7 @@ static int airoha_qdma_init(struct platf
  38                 return qdma->irq;
  39
  40         err = devm_request_irq(eth->dev, qdma->irq, airoha_irq_handler,
  41 -                              IRQF_SHARED, KBUILD_MODNAME, eth);
  42 +                              IRQF_SHARED, KBUILD_MODNAME, qdma);
  43         if (err)
  44                 return err;
  45